Made it simpler