Little change of code and methods
Almost prepare to make all GUI