Using dev (10/26)

Using dev