Merge anuraggarg's changes