Updated placement code