#43 Using a better naming for the new functions