Updated functions/views