restructure and additional options