updated to new connect-form