Made changes, added custom feature tools