Slightly less buggy but lots of weird stuff happening