changed some things to increase usability