Simplyfied the proxy