Need max's updates

need your changes