got rid of unused "context" parameter