First working version with correct popup numbers. #64