new version with iframe fix