update to v3

merging changes from staging branch