Add option for using the whole sample