Dev branch

Revised Code