Updated for test purpose