minor modifications + reviews