updated for minor changes