Not exclusive to 3.x anymore