updated to be more RESTful