bugfix changed order
updated geometry