updating some stuff..need to check locking