got rid of feature/depreciation warnings