Removed temp params as no longer needed