added usability features etc