moar updates - better usability