Incorporated more feedback