added stuff and things work better