First Debug

Some bug still there