added some color and all