changed terminology & tools a bit