updates as per agreement with Livious