Update to composite code so it works