Some edge case scenarios I missed