Tweak to structure, working now