deprecated features + bugfix