Missing code from last merge added