Version 3

more updates