Continued work on integration