updated functionality, user options