Fix bugs
Testing