Feature/club 1072 3