In Progress

modify some indicators