Feature/tools with liosha's update