Made things simpler