UPDATED VERSION

issues un fixed