added simpleform and some additional features