First commit for margin feature