Removed contstants because it shouldn't be in this branch.