map collision redone