Logic for id < 0 has been added