Updated to reflect consisitent functions