finalzing changes