Made it more simpler and useful