changes for basic forms functionality