Reverted to first design

Merge it, bitch