some changes in form+en