restructuring: version beta