Big methods update