updated structure, improved format