Photo by Jonathan Bachman/Getty Images

New Orleans Pelicans two-way forward Naji Marshall has agreed to a new three-year, $5.3 million deal, according to Shams Charania.

The rest of this season and next season will be fully guaranteed.

Marshall has become a mainstay in the team’s rotation in April and May.

The 23-year-old undrafted rookie is averaging 6.4 points, 4.1 rebounds and 2.6 assists per game in 19.8 minutes per game.

His best game came back on April 16 against the Washington Wizards when he recorded 16 points, 11 rebounds, six assists, two steals and shot 4-of-10 from the field.

Marshall is one of the team’s best defenders, as head coach Stan Van Gundy has had him guard some of the NBA’s best scorers including Stephen Curry, Bradley Beal and Kyrie Irving.

“I really take it to heart when people score on me, or if I didn’t do a good defensive job,” Marshall said in April. “Definitely my approach to the game is to try to stop my man from scoring as many times as I can, and be the best teammate. I’m really defensive-minded before anything.”

After promoting Marshall to the 15-man roster, the Pelicans now have an open two-way slot that they can fill before the season ends.