switched to swing class