removed warnings / back functionality added