Several changes have been made and new files have been added