Big Update

add pitch name
refactoring