new info on mars
merged changes