Some minor changes, removed dubble stuff