By Ethan

Bug fixing took longer than expected.