Apply changes (15/16)

Apply changes