updated locking for w8