merged files together and mades notes with Ben