Added Debug
Merge with prototype