fixing elvin's messups