edited vinh's file