Added features II