implementation update to allow tests to pass