Added a new function for cleaner control.