Added magnification, generalized some more procedures