#31 Some refinements