moving addition of id in code