Added check to prevent initial redrawing
Added id comment