removed unnecessary method
updated methods