some tweaks added to the system