Updates by Neoperl