Incorporating Prabhas' awesome feedback