Updated engine
Added TODO that we need to check in Travis CI