Finishing up pulling in changes