incomplete annotations, modified a few classes