cleaned up for version 0.1