Simpler than previous method