Lock added, BP modified