Merged with new changes, added margin changing with voice