added lost changes from master bevor commit