Updated to latest version used on actual projects