changes

current updates.
deleted

was making conflict