new controls && modification