reorganizing and suggestions