Major rehaul to ge format