removed self. stuff - dangers of cutting and pasting