Form been added. Some little changes