Cosa1

Merging two changes in the morningstretches.