Fixed color and some speed up