Tweaks to response
Update todo