Feature/shuttl samples