Add return
Fix update id count