removed warning and fixed feedback problem