restructure, also closer!