some more changes in forms