Using the correct finder now