Added updated methods