Working, but needs color fix