first changes from feature2