CI 2.1.3 with some basic modifications, ready for project use