some tweaks ID-230