Made it more userfriendly