just submitting eb42's changes.......