Updated this to where it is working