fixed stupid method calls
changed format