Comments added from BC. Fantastic work