Latest codes

Fixed timeout issues