refatorate render #2