Use own engine

Please test before merge