Made it simpler.