Better use of $baseline