Updated commentation