TODO LIST updated, setup phase fixed