added stuff for beta 1.1