Trying to make work with changes...