Added forgotten updates for last commit