retrieve works and my fixes