1.8 now working