cleaned up coonditoins