renamed and removed warnings