A little more maintennance for usability