Continued work on CI