changed structure, added tabs