Updated code and files