Trying this, added better logging