put conditions
Merge remote-tracking branch 'origin/CristiN'
I don't even know what changes I made 2 days ago.