Updated to simplify