changed things like I described in last mail