API remodelled after jenglish's suggestions