Update for first work build