Revert change, demo purpose

Changed back and make some other change