added own changes