syncing with reportbase as we still haven't really switched. comments &
extra functions