This is a huge error with bug fixes for hannah