CS 4495 PS5 Commit