updated and removed testing