modify some var name and added the other dependencies