Not using thermal engine anymore, so make appropirate changes