added number and fixed id bug