Improvement

Should be good for 2.0