finalizing some changes