changed form and added model