my review comments should not be included :-)
it's still using map