Fix arrow, better code.