Might have fixed it, little changes needed