cleaning up some magnific implementation