Changes as suggested by Stoyan