Reverted to first design