better building
add watch