made it simpler