removed double checks