improved codebase and auto day selection