Implementing all standard changes