changed forms to generic