Improve integration slightly - still buggy