merged latest changes from Ovni game