Adding some better code.