changed l3-wide design (pending implementation)