updated Basics and Prop, deleted Prop1