Updated with windows phone project