Reworked Machine internal logic