added request types
merged changes with Brian's