made a lot of changes after Beverlys comments