Edited code for reviewing again