few things modified