added earlier modifications
new is better