cleaned up for 2.0b9