changed the structure and added new geometry