Latest changes
Added remaining