Removed timing functions
Testing infinite loop streaming
Merging changes