eliminating border clip
adding no mask version
Merge branch 'nomask'