Changed some methods, removed b