//Old logic reimplemented but atm tiny Scale