[SQUASH ME] addressed comments