Begining of solution for lite builds