Updated with latest functions