weekend  refact