restructure and additional info