updated files, and funtions