Changes as discussed (verification on Win pending)