removing that switcheroo thing because it is just confusing as hell