Updated to demo specifications