last changes.. project will be merged with jForm