FINAL FIXEDDDDDD