Yes - With Improvements

Yes - Just like how it was in 3U