changed logic around a bit for a more likely use-case