renamer added and a little fix in restart