I gang

Private project for Damir (form fix)