dan edit and added new files