yet more changes regarding the form