After code refractoring #1