Adding two forms to replace old ones