Updated commet to match behaviour