Remove this so I can later refactor it and make it work properly