Final changes. All work is done :) Only analyze is left.