Added tip-handling.