merge
Updated version
Renamed methods