Split into files + bug fixed + cls