updated code and presentation