Final changes on my side