Corrected some punctionality stuff. This is the SAD version sent to Rody.