incorporate review from larsacus