Additional commits for final sprint