final commit for polished version