Added switching sides support