added speed and started refactor on true wind