merged changes

combined last two changesets