Fixed 0 error, ready for testing