Fixed colors and added performance measures