merge w/ current work