Removed testing part