changed the way in which I deal with non standard projects