Make it more userfriendly