update to match our needs