Changes made for demo and changed back to original