Added ada
merging
merge
merge
modified
merge
added find by method