Still buggy, working better