modular selection
moved trigger check to beginning for faster processing
renaming
renaimng