An enhanced model for the capillary rise problem. (July 2020)