Updated with device constants