changed form functionality