Updated code minus configuration files