some thoughts for better organisation