Some interesting changes made