Making some little changes for delivery