Added some code that got removed during merging different branches by accident