re final

all changes finsihed