Further modeling (reverted several changes)