Code refinements and added Ore Block