Fully Extracted
Fix bugs