Functions updates and additions