rework on commented out stuff