Integration still buggy