adding some more technical wizardry