Note to todd: See why this is added