added tp7
did TP7, TODO remains