Added WIP improved topology