MP: geometry added (not finished, yet)