Fixed so everything works