about to clean up code...safe to revert