More forms modifications