Version 0.7.1 - removed a bit of looping code (normally happens on initialization)