Fixed incompleted classes
Added tp 2