alot of extra stuff deleted again mostly in dthe class ordere