Made it a bit more straightforward and easier to use