pulling chris' changes