updated for 12