upped version
Merge branch 'master' into working
adding in bonus logic