porting Category changes
Use developer visible comments for organisation