suggested change to clean the high level api