few backend changes