merged chris stuff w mine