less usage of deprecated functionality