Updated both forms