removed external shuffle func, added sunday checker