merge janet's changes