Catching up with new commit Javelin Guidry