Fixed final stuff. Should all be good