Better rendering

As you ask me, i reposted it in mc16 branch