lock update - goo and ld changes