Bringing back changes that were lost in last push