Addressed all the comments made by Wouter