syncing to KL's changes