Location changed in poc branch