2nd Commit - Color fix