Experiemental re-factor with slightly different approach