Feature/club 677

still checking