Important error spoted, changed some methods