switch to yank, and update to commons-lang3