some swift constructions change