Added Open/Closed Logic