Changed colors / commented