changed form to improve useability