added flipper
merged