Removed testing code, updated version