some modification
add color