refactored, good idea, thanks.