Missing parts from last commit