simplified things
further simplified things