Updated code and jars