jay's branch of ember w/ fix