New versin for Week1 without hardcoding, speed increased