Some changes to move on the development