4/20 bug fixed. ready for Sunday testing