Updated code in new branch with new Buffer and config file