Making it similar to NandaNikhil branch