Should add $message here as well