Think I need to simplify