implemented some more