Applied some more feedback