Timing and Refactoring

Attempt to modify for Period parameter