Sorta buggy, but not crashing like before