bug fixing. using one form instead of two