reuploading this because i fixed some things