Removed testing and implmentation code