Added base, and updated example