Final changes .. fingers crossed