more features, comment out stop code