More optimization
added color indicator