chang order of attributes
remove commeted out code
add some more color codes
update changes