first version from agency template
some changes