reviewed some other parts