Decrease output and accept more variables from client