updated for saturday and other tweaks