Another idea for the next version...