Dev Commented some debug lines