apply more pfarley feedback