Ligic changed, comments added