some *fun* changes