factor manjor chjanges before new geo added