Status: GREEN

1. Merged Jordan's changes