add some quick&dirty stuff for alpha test