kill groovy ;)
EVU-61 form elements added