fixed method names and calls