fixed update, it's still buggy tho