Resolved commenting diff, please look over it