Made it work after changes