Modified to not use wstool