More style. Added password modifier functionality