v2

added new stuff