Final changes. Ready to ship