v05 more updates

v05 more updates