this huge commit contains all scenarios. Have to sort and clean them