Edited and added new files