Some function are updated