better code now