finalized some changes