CHANGE: Updated functions