Added first function implementation and renamed member