Added better colors - still need bounds checking