[~TASK] Re-Integrated luka branch