Got rid of Matt's stupidity