Adjusted abstraction appropriately