Comments and changes to logic: