complete change, now working