V3

Clean-up and added content