added some helpers, etc.