Also, why does this duplicate the previous function?  Get rid of one of them or at least combine them sensibly.