Changes after some debugs