Updated with better week commencing code