Bugfix: Adding return value at end of run method. Rearranging