attempt to simplify even further