(Just for ref: got rid of this odd structure)