added stuff for jon