revert to before anthonys push. removes bugs introduced