enhanced form + small stuff