add watcher
fix height
update