need to fix last 2 methods