Simplier and more straight forward code