Status: GREEN

Merging Marcus changes