re-orginized locations to keep new working script clean and clear