changes to accomodate new ember