First Update

First update after the modifications