Took remarks of @stloyd in account