just submitting lmfreeg's changes...