it works using ember
small fixes