Made things more simple