Updated to use correct information