some changes, destroy method not working for #3