Added missing updates from last commit