#50 make correct retrieves