Wingsan's changes