Final method changes