removed testing code, fix code to as was