Changed swf implementation