change of structure for best usability