reuploading final changes, mine