1-12 now working correctly