Added Schipka's changes