I think everything is fixed and works