updated more methods