improved universal plugin =)