pulling in tj's changes