Changed structure back, new way didn't work.