major changes, in the process of preparing for legit engine