daniel handling requests
merged daniels comments