Added code to keep info after submit