changes before merge
jr broken, trying to fix it