Fixed date, added sol u
merged and fixed