removed line, added pass.word support