Updated to use constant var