Changed a bit some methods