added new bits from a other project
tweak tweak test test