Syncyng

Just a quick commit in order to be able to sync with rodrigo files