updated standalone