Changed two methods