fix toggle and add it to manager