#196 little changes to form interaction