Fixed Loading v1
Laoding v2 done