Changed constructor and some method name. And added 2 methods.