fix to use new components
singtel demo edits