some helpers added