cleaned up oct 16 and nov 6th