3rd revision: removed extra code