adding comments and removing the panic.