chnage name and added new methods