added swing support