Added new fixed buildtool