Promoted code to the top level, this may now work?