more work on the classical map