merge robjo's changes