dding Ambers changes for demo