updated for 12.1.2