Updated code base