Added some code, that needs review