updated Constants to match Anna's