minor changes for alexandra, just convenience