Update vramel with peter's changes