Continuing implementing the base