The future of first ballot UFC Hall of Fame fighter B.J. Penn is still up in the air, as it has been since “The Prodigy” lost to Rory MacDonald in December, but it at least appears as though things are finally starting to settle. Though no decision has been made on whether Penn will listen to boss Dana White and retire or return to the Octagon, the 34-year old is dead set on coming back at 155 pounds if he does indeed see action again.

According to a report from UFC Tonight, the double-division former champion is currently in the process of making sure he is both mentally and physically ready for a fight at lightweight. If confident in both departments, Penn seek a scrap out before the end of the year.

The move is likely a relief to fans concerned about Penn’s past preference to compete as a welterweight despite a slew of poor performances in the division. The defeat to MacDonald dropped the popular pugilist’s record to 2-5-1 inside the Octagon as a 170 pounder. Meanwhile, the 16-9-2 Penn has fared much better at 155 where he’s beaten the likes of Sean Sherk, Kenny Florian, and Diego Sanchez.