Final version 1 updates