Refactored schedule online