adjusted some parts to new software architecture