updates for id to handle more and reverting