Moified find ID and register ID to better comply with the new registered system