Updated with Constants