cleaned up for version 1.2