changing TODO comment and engine type method