no lock needed
Minor form changes