Last changes to construct()