made form more efficient