made much simpler
simplifying