Fix Luke's pic and times
Merge