second commit. working fine but still with sharp edges