Improve & fix swing extension