reworked structure and added scaling