updated for SWAGGER