Changed the way ID works