tweaks, implement further changes in time permits