added puppi stuff