version 2.1.5.1-a, cleaned up