Slight tweaking of 0.8 lib