Rework mouse over object code