made everything simpler