Re-added Pranavs changes