Updated code and included library files