modernize this and add another portion on the right hand side