applying feedback from @agn1eszka