rebuilt with @intron added!