Adding better code