merging files

Updating implementation