tweak to normalized structure