Made it more usable