added some markup sugaring