Simplify logic even more I think