added -u/-p support