Not quite as buggy