fixed merge issues, removed balloon.