update according to kevin advices