Updating the patch as per the comment and moving as per #38