Updated

Got rid of errors and horrible logging feature now more simpler ! :)