clean to P30
add some