FIXING DUH STUFF