upcoming update will make this easy