marco made some changes here