Improvements to weekly class