Switch version reads better and extends easily