Some changes
Started work