changing the structue to Partha's format