Final changes - it works!