move to maxsample for real