getting chris' changes