mad some more requested changes