add fields for SOURCE and	 DESTINATION. Fix style.