#update - transform to swift