Updated ember stuff