Added all modifications from previous comment