Bug fixed + updates
Bug fixed + updates