added comments to skips
Merged with import alteration