Pushed up those two calls so it looks like more time is spent loading, and they aren't removed prematurely