renamed + moved functions