Made it more user-friendly; tried to add functionality