Final changes with alert messages