Added/removed mps and added static variable for password