eliminated extra border
Merge branch 'capright' into testing