Updated version and renamed methods