Revamp look, modify code to work with MEC