shape fixes
classes removed
oscilation fixed
oscilation fixed
oscilation fixed