reslove issues plus setup work
changes