second attempt at first changes